Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#240

Merged
mssonicbld merged 5 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge
Jan 30, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#240
mssonicbld merged 5 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge

Conversation

@mssonicbld
Copy link
Collaborator

* a118a5ba4 - (head/202305) [chassis] Added support of isolating given LC in Chassis with TSA mode (#16732) (#17860) (2024-01-29) [abdosi]
* 18fbca839 - Fix error log while creating PSU thermal object (#17789) (2024-01-29) [Junchao-Mellanox]
* 6a76a73b0 - Change tcp port range to support telemetry and gnmi (#17907) (2024-01-29) [ganglv]
* 1e758d453 - [qos] change the template keyword from Compute-AI to ComputeAI (#17902) (2024-01-29) [Kevin Wang]<br>```

kevinskwang and others added 5 commits January 29, 2024 14:32
Why I did it
Align the keywords to make qos configuration take effect

Work item tracking
Microsoft ADO (number only):
How I did it
Change the keyword to ComputeAI

How to verify it
reload minigraph and check the qos configuration
* Reserve tcp port for telemetry and gnmi

* Use ip_local_port_range instead

* Fix sysctl config
- Why I did it
If a PSU is not present, there could be error log while restarting psud or thermalctld:

Jan  8 17:15:52.689616 sonic ERR pmon#psud: Thermal sysfs /run/hw-management/thermal/psu2_temp1_max does not exist

Jan  8 17:15:57.747723 sonic ERR pmon#thermalctld: Thermal sysfs /run/hw-management/thermal/psu2_temp1 does not exist

- How I did it
if a PSU is not present, we should not check the PSU temperature sysfs.
…e (#16732) (#17860)

What I did:
Added support when TSA is done on Line Card make sure it's completely
isolated from all e-BGP peer devices from this LC or remote LC

Why I did:
Currently when TSA is executed on LC routes are withdrawn from it's connected e-BGP peers only. e-BGP peers on remote LC can/will (via i-BGP) still have route pointing/attracting traffic towards this isolated LC.

How I did:

When TSA is applied on LC all the routes that are advertised via i-BGP are set with community tag of no-export so that when remote LC received these routes it does not send over to it's connected e-BGP peers.

Also once we receive the route with no-export  over iBGP match on it and and set the local preference of that route to lower value (80) so that we remove that route from the forwarding database. Below scenario explains why we do this:

- LC1 advertise R1 to LC3
- LC2 advertise R1 to LC3
- On LC3 we have multi-path/ECMP over both LC1 and LC2
- On LC3 R1 received from LC1 is consider best route over R1 over received from LC2 and is send to LC3 e-BGP peers
- Now we do TSA on LC2
- LC3 will receive R1 from LC2 with community no-export and from LC1 same as earlier (no change)
- LC3 will still get traffic for R1 since it is still advertised to e-BGP peers (since R1 from LC1 is best route)
- LC3 will forward to both LC1 and LC2 (ecmp) and this causes issue as LC2 is in TSA mode and should not receive traffic

To fix above scenario we change the preference to lower value of R1 received from LC2 so that it is removed from Multi-path/ECMP group.

How I verfiy:

UT has been added to make sure Template generation is correct
Manual Verification of the functionality
sonic-mgmt test case will be updated accordingly.
Please note this PR is on top of this :#16714 which needs to be merged first.

Signed-off-by: Abhishek Dosi <[email protected]>
@mssonicbld mssonicbld merged commit ce0703a into Azure:202305 Jan 30, 2024
r12f pushed a commit that referenced this pull request Dec 19, 2024
…lly (#19038)

#### Why I did it
src/sonic-gnmi
```
* 585f441 - (HEAD -> master, origin/master, origin/HEAD) Add SaveOnSet (#108) (28 hours ago) [Ryan Lucus]
* 81174c0 - Fix full config update (#240) (2 days ago) [ganglv]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Sep 18, 2025
…AD automatically (#1633)

#### Why I did it
src/sonic-utilities
```
* ab740c14 - (HEAD -> 202412, origin/202412) DOM for flat memory transceiver modules (#240) (4 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Oct 26, 2025
…AD automatically (#1633)

#### Why I did it
src/sonic-utilities
```
* ab740c14 - (HEAD -> 202412, origin/202412) DOM for flat memory transceiver modules (#240) (4 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants